log: Set content type header for http sink #77014
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The content type header for the output of HTTP log sink is always set to text/plain irrespective of the log format. If the log format is JSON, we should set the content type to be application/json. Release note (bug fix): The content type header for the HTTP log sink is set to application/json if the format of the log output is JSON.
|
This change is |
dhartunian
approved these changes
Feb 25, 2022
There was a problem hiding this comment.
Reviewed 2 of 5 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @cameronnunez and @knz)
|
TFTR! bors r=dhartunian |
|
Build succeeded: |
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from 65c59a6 to blathers/backport-release-21.2-77014: POST https://api.github.com/repos/cockroachlabs/cockroach/merges: 403 Resource not accessible by integration [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 21.2.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
knz
added a commit
to knz/cockroach
that referenced
this pull request
Mar 1, 2022
This is a fixup to cockroachdb#77014: - the content-type is not a property of the format *parser*, it's a property of the format itself. Touching `formatParsers` to compute it is an abstraction mismatch. - the content-type is constant for a given log config. There's no need to re-compute it on every log entry. It can be computed and stored once when the config is applied in `flags.go`. (Also, the `outputLogEntry` code is time-sensitive, so we don't want to give it more work.) - the content-type is only needed for HTTP sinks. No need to compute it for other sink types. So its retrieval can be confined to `newHTTPSink`. Release justification: bug fix Release note: None
|
please backport together with #77210 |
craig bot
pushed a commit
that referenced
this pull request
Mar 3, 2022
77210: util/log: only compute content-type once r=rimadeodhar a=knz This is a fixup to #77014: - the content-type is not a property of the format *parser*, it's a property of the format itself. Touching `formatParsers` to compute it is an abstraction mismatch. - the content-type is constant for a given log config. There's no need to re-compute it on every log entry. It can be computed and stored once when the config is applied in `flags.go`. (Also, the `outputLogEntry` code is time-sensitive, so we don't want to give it more work.) - the content-type is only needed for HTTP sinks. No need to compute it for other sink types. So its retrieval can be confined to `newHTTPSink`. Release justification: bug fix Release note: None Co-authored-by: Raphael 'kena' Poss <[email protected]>
rimadeodhar
pushed a commit
to rimadeodhar/cockroach
that referenced
this pull request
Mar 3, 2022
This is a fixup to cockroachdb#77014: - the content-type is not a property of the format *parser*, it's a property of the format itself. Touching `formatParsers` to compute it is an abstraction mismatch. - the content-type is constant for a given log config. There's no need to re-compute it on every log entry. It can be computed and stored once when the config is applied in `flags.go`. (Also, the `outputLogEntry` code is time-sensitive, so we don't want to give it more work.) - the content-type is only needed for HTTP sinks. No need to compute it for other sink types. So its retrieval can be confined to `newHTTPSink`. Release justification: bug fix Release note: None
koorosh
pushed a commit
to koorosh/cockroach
that referenced
this pull request
Mar 5, 2022
This is a fixup to cockroachdb#77014: - the content-type is not a property of the format *parser*, it's a property of the format itself. Touching `formatParsers` to compute it is an abstraction mismatch. - the content-type is constant for a given log config. There's no need to re-compute it on every log entry. It can be computed and stored once when the config is applied in `flags.go`. (Also, the `outputLogEntry` code is time-sensitive, so we don't want to give it more work.) - the content-type is only needed for HTTP sinks. No need to compute it for other sink types. So its retrieval can be confined to `newHTTPSink`. Release justification: bug fix Release note: None
24 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The content type header for the output of HTTP log sink
is always set to text/plain irrespective of the log format.
If the log format is JSON, we should set the content
type to be application/json.
Release note (bug fix): The content type header for the
HTTP log sink is set to application/json if the format of
the log output is JSON.